From b0f392534f5228f21d751cbab15c66c7489c78fc Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 18 Nov 2016 06:19:27 +0100
Subject: [PATCH] coloreditor: Don't draw a background on boxes

Boxes know how to draw backgrounds these days.
---
 gtk/gtkcoloreditor.c     | 19 -------------------
 gtk/ui/gtkcoloreditor.ui |  3 ---
 2 files changed, 22 deletions(-)

diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index ed8f48b7a7..07dcfcccae 100644
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -335,24 +335,6 @@ scaled_adjustment (GtkAdjustment *a,
   return as;
 }
 
-static gboolean
-popup_draw (GtkWidget      *popup,
-            cairo_t        *cr,
-            GtkColorEditor *editor)
-{
-  GtkStyleContext *context;
-  gint width, height;
-
-  context = gtk_widget_get_style_context (popup);
-  width = gtk_widget_get_allocated_width (popup);
-  height = gtk_widget_get_allocated_height (popup);
-
-  gtk_render_background (context, cr, 0, 0, width, height);
-  gtk_render_frame (context, cr, 0, 0, width, height);
-
-  return FALSE;
-}
-
 static void
 gtk_color_editor_init (GtkColorEditor *editor)
 {
@@ -506,7 +488,6 @@ gtk_color_editor_class_init (GtkColorEditorClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkColorEditor, a_adj);
 
   gtk_widget_class_bind_template_callback (widget_class, hsv_changed);
-  gtk_widget_class_bind_template_callback (widget_class, popup_draw);
   gtk_widget_class_bind_template_callback (widget_class, popup_key_press);
   gtk_widget_class_bind_template_callback (widget_class, dismiss_current_popup);
   gtk_widget_class_bind_template_callback (widget_class, get_child_position);
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index ecaf9fa8ea..b36aa3329b 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -139,7 +139,6 @@
       <class name="popover"/>
       <class name="osd"/>
     </style>
-    <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid4">
         <property name="visible">1</property>
@@ -186,7 +185,6 @@
       <class name="popover"/>
       <class name="osd"/>
     </style>
-    <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid3">
         <property name="visible">1</property>
@@ -233,7 +231,6 @@
       <class name="popover"/>
       <class name="osd"/>
     </style>
-    <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid2">
         <property name="visible">1</property>
-- 
2.30.2